From e90cdd8375d0b88e9d63d767dea74db0d2446d24 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 14 Apr 2011 01:30:01 +0000
Subject: [PATCH] Stupid MSVC still doesn't accept C99.   Dumb down for it.

---
 gpsbabel/gdb.c | 6 +++---
 gpsbabel/mmo.c | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c
index e122eccf7..022b14756 100644
--- a/gpsbabel/gdb.c
+++ b/gpsbabel/gdb.c
@@ -110,8 +110,8 @@
 
 /*******************************************************************************/
 
-/* static char gdb_release[] = "$Revision: 1.73 $"; */
-static char gdb_release_date[] = "$Date: 2010-10-18 13:29:25 $";
+/* static char gdb_release[] = "$Revision: 1.74 $"; */
+static char gdb_release_date[] = "$Date: 2011-04-14 01:30:01 $";
 
 static gbfile *fin, *fout, *ftmp;
 static int gdb_ver, gdb_category, gdb_via, gdb_roadbook;
@@ -1327,7 +1327,7 @@ route_write_bounds(bounds *bounds)
 		FWRITE_DBL(bounds->max_alt, unknown_alt);
 		FWRITE_LATLON(bounds->min_lat);
 		FWRITE_LATLON(bounds->min_lon);
-		FWRITE_DBL(bounds->min_alt, -unknown_alt);
+		FWRITE_DBL(bounds->min_alt, -(unknown_alt));
 	}
 	else FWRITE_C(1);
 }
diff --git a/gpsbabel/mmo.c b/gpsbabel/mmo.c
index d2ac2f77c..a36859997 100644
--- a/gpsbabel/mmo.c
+++ b/gpsbabel/mmo.c
@@ -367,13 +367,13 @@ mmo_read_CObjIcons(mmo_data_t *data)
 	const char *sobj = "CObjIcons";
 #endif
 	int icon_id;
+	gbuint16 u16;
 
 	DBG((sobj, ":-----------------------------------------------------\n"));
 	DBG((sobj, "name = \"%s\" [ visible=%s, id=0x%04X ]\n", 
 		data->name, data->visible ? "yes" : "NO", data->objid));
 
 	if (mmo_version >= 0x18) {
-		gbuint16 u16;
 		u16 = gbfgetuint16(fin);
 		DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16));
 		u16 = gbfgetuint16(fin);
@@ -383,7 +383,6 @@ mmo_read_CObjIcons(mmo_data_t *data)
 		u16 = gbfgetuint16(fin);
 		DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16));
 	}
-	gbuint16 u16;
 	u16 = gbfgetuint16(fin);
 	DBG((sobj, "unknown value = 0x%04X\n", u16));
 	u16 = gbfgetuint16(fin);
@@ -788,10 +787,10 @@ mmo_read_object(void)
 
 	objid = gbfgetuint16(fin);
 	if (objid == 0xFFFF) {
-		DBG(("mmo_read_object", "Registering new object type\n"));
 		gbuint16 version;
 		char *sobj;
 		int len;
+		DBG(("mmo_read_object", "Registering new object type\n"));
 		
 		objid = mmo_object_id++;
 
@@ -824,12 +823,12 @@ mmo_read_object(void)
 		data->name = mmo_readstr();
 
 		if (objid != cat_object_id) {
+			gbuint32 obj_type;
 			data->ctime = gbfgetuint32(fin);
 			data->mtime = gbfgetuint32(fin);
 			data->locked = gbfgetc(fin);
 			data->visible = gbfgetc(fin);
 
-			gbuint32 obj_type;
 			obj_type = gbfgetuint32(fin);
 #ifdef MMO_DBG
 			gbuint32 expected_type = 0xFFFFFFFF;
-- 
2.30.2